wayland/layer: Exclusive edge fix, protocol version 5, arrange order
#1819
+104
−38
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
YaLTeR
reviewed
Sep 10, 2025
ids1024
force-pushed
the
layer-shell-arrange
branch
from
984cd7a to
223ac50
Compare
ids1024
force-pushed
the
layer-shell-arrange
branch
from
223ac50 to
9668eae
Compare
|
Looks like the handling of the edge for exclusive zones there isn't quite right already. x if x.contains(Anchor::TOP) && x.contains(Anchor::BOTTOM) => {
zone.size.w -= amount;
if x.contains(Anchor::LEFT) {
zone.loc.x += amount;
zone.loc.x += data.margin.left;
zone.size.w -= data.margin.left;
}
if x.contains(Anchor::RIGHT) {
zone.size.w -= data.margin.right
}
}This case appears before the We could have a function to determine the exclusive edge, if any. And also add support for version 5 of the protocol supporting an explicit exclusive edge: https://gitlab.freedesktop.org/wlroots/wlr-protocols/-/merge_requests/123 |
This simplifies the match for anchors, and should correct the behavior for things like anchoring all edges. I believe previously the `x == Anchor::all()` case would never be reached, since the `x.contains(Anchor::TOP) && x.contains(Anchor::BOTTOM)` condition would also be true. Also the behavior is wrong; the spec says to treat this like `ExclusiveZone::Neutral`. This should now behave as defined by the spec.
Use the exclusive edge provided by the request if present. Otherwise, fallback to the implied edge based on anchors.
Iterate over surfaces that have an exclusive zone first, then other surfaces. This allows a surface that doesn't have an exclusive zone to be moved or resized for a later surface that does have an exclusive zone. As is probably desired.
ids1024
force-pushed
the
layer-shell-arrange
branch
from
9668eae to
3290055
Compare
ids1024
changed the title
arrange(), handle exclusive zone surfaces firstarrange order
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Iterate over surfaces that have an exclusive zone first, then other surfaces. This allows a surface that doesn't have an exclusive zone to be moved or resized for a later surface that does have an exclusive zone. As is probably desired.
This does help with a test client, but not with the client I was trying to fix; so I need to do a bit more testing here...